Merge.
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Thu, 6 Apr 2006 16:49:21 +0000 (17:49 +0100)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Thu, 6 Apr 2006 16:49:21 +0000 (17:49 +0100)

Trivial merge